From a2249ef135fd9653d25aabe96cd794edb9cda686 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Wed, 28 Jan 2026 21:03:25 +0100 Subject: [PATCH] make-package-modules-not-suck Gbp-Pq: Name make-package-modules-not-suck.diff --- Repository.mk | 49 +++++++++++++++++++------------- scp2/AutoInstall.mk | 1 + scp2/InstallModule_draw.mk | 1 + scp2/source/draw/module_draw.scp | 4 ++- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/Repository.mk b/Repository.mk index 79eceddda88..c3555930fe9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -271,13 +271,29 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \ abp \ + calc \ + dba \ + dbahsql \ + $(call gb_Helper_optional,DBCONNECTIVITY, \ + dbase \ + dbaxml) \ dbp \ dbu \ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ + $(if $(ENABLE_JAVA),jdbc) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \ + $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ + odbc \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,base, \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \ + $(if $(ENABLE_JAVA),hsqldb) \ + sdbc2 \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ analysis \ - $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ date \ pricing \ sc \ @@ -292,6 +308,12 @@ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,calc, \ scui \ )) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,draw, \ + animcore \ + sd \ + sdd \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ svgfilter \ wpftdraw \ @@ -299,9 +321,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \ - animcore \ PresentationMinimizer \ wpftimpress \ + slideshow \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \ @@ -406,11 +428,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(filter $(OS),WNT),,cmdmail) \ configmgr \ ctl \ - dba \ - dbahsql \ - $(call gb_Helper_optional,DBCONNECTIVITY, \ - dbase \ - dbaxml) \ dbtools \ deploymentmisc \ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \ @@ -423,7 +440,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(filter WNT,$(OS)),emser) \ evtatt \ $(call gb_Helper_optional,DBCONNECTIVITY, \ - flat \ file) \ filterconfig \ fps_office \ @@ -435,7 +451,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,helplinker) \ i18npool \ i18nsearch \ - $(if $(ENABLE_JAVA),jdbc) \ $(if $(filter WNT,$(OS)),jumplist) \ $(if $(ENABLE_LDAP),ldapbe2) \ $(if $(filter WNT,$(OS)),WinUserInfoBe) \ @@ -450,10 +465,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ msfilter \ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ - $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \ - $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ numbertext \ - odbc \ odfflatxml \ offacc \ oox \ @@ -467,10 +479,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ sb \ $(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \ scn \ - sd \ - sdd \ sfx \ - slideshow \ sot \ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,spl) \ storagefd \ @@ -481,7 +490,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ svt \ svx \ svxcore \ - sw \ syssh \ textconversiondlgs \ textfd \ @@ -528,12 +536,15 @@ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \ $(if $(ENABLE_CUSTOMTARGET_COMPONENTS),components) \ cui \ icg \ - sdui \ $(if $(ENABLE_GEN),vclplug_gen) \ $(if $(filter $(OS),WNT),vclplug_win) \ $(if $(filter $(OS),MACOSX),vclplug_osx) \ )) +$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,draw, \ + sdui \ +)) + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,postgresqlsdbc, \ $(if $(BUILD_POSTGRESQL_SDBC), \ postgresql-sdbc \ @@ -568,6 +579,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \ hwp \ $(if $(ENABLE_LWP),lwpft) \ msword \ + sw \ swd \ t602filter \ $(call gb_Helper_optional,SCRIPTING,vbaswobj) \ @@ -676,12 +688,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ ) \ cached1 \ comphelper \ - $(call gb_Helper_optional,DBCONNECTIVITY,dbpool2) \ $(call gb_Helper_optional,BREAKPAD,crashreport) \ deployment \ deploymentgui \ embobj \ - $(if $(ENABLE_JAVA),hsqldb) \ i18nutil \ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \ $(if $(and $(ENABLE_GTKTILEDVIEWER), $(filter WNT,$(OS))), libreofficekitgtk) \ @@ -691,7 +701,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ emboleobj \ package2 \ $(call gb_Helper_optional,SCRIPTING,scriptframe) \ - sdbc2 \ sofficeapp \ srtrs1 \ ucb1 \ diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 4f66255c8da..3ebb6814459 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -16,6 +16,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) +$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST)) $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE)) $(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE)) diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk index a7c02bef4ba..d48edf2b9e9 100644 --- a/scp2/InstallModule_draw.mk +++ b/scp2/InstallModule_draw.mk @@ -10,6 +10,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/draw)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\ + draw \ draw_brand \ )) diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp index 87375797e1c..a3ee5f935f4 100644 --- a/scp2/source/draw/module_draw.scp +++ b/scp2/source/draw/module_draw.scp @@ -18,6 +18,7 @@ #include "macros.inc" +#include "AutoInstall/draw" #include "AutoInstall/draw_brand" Module gid_Module_Prg_Draw @@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin Sortkey = "100"; Default = YES; Styles = (HIDDEN_ROOT); - Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw, + Files = (auto_draw_ALL, + gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw, gid_File_Share_Registry_Draw_Xcd, gid_File_Tmp_Userinstall_Draw_Inf); End -- 2.30.2